package com.xgp.learn;

/**
 * Created by xieguoping on 2017/5/4.
 */
public class Demo {

    public static void main(String[] args) {
        System.out.println("hello world");
        System.out.println("new branch");
        System.out.println("test merge");
        System.out.println("branch 1 and 2 modifie");
    }
}
